moved the new tests to more appropriate place