Simple refactorings
Now test gputest.main_test_1tl_inner is done
Enabled main_test
Enabled main_test
-