Verified that simple tests can run with the updated structure.
Performed full tests (02 and 04 using cuda).