Implement required method, fix tests