Refactoring tests and abilities