Break again, fix tests