Update some fixtures and fix tests