Remove some finalize stuff
Remove prepare()
Refactoring out _test_s