changes to test structure and starting to rewrite tests
remove tmp file
:
remove tmp file
: