Refactoring tests. #51