[TEST] move test2 files to test directory

prepend test2 tests with '_' so they run first, for a not thoroughly investigated reason they only work when run before the other tests