Move unit tests around