Updated tests and fixtures