moving test into the right place