Moving some methods
Fixing test description