Enhancement/refactored tests