Feature #53, refactoring tests