Moving some unit-tests to a folder