Update tests and fixtures