Apply review, fix tests