Refactored: tests to compound