Move unit test to correct place