moving tests to one directory #1