Moving tests to correct location, fixing coverage