Refactorings & fixed way test