Replace methods with properties and fix tests