move tests into the right location