move tests to right place, still failing