reorganized tests in separate dir, more according to convention