modified the fixtures and unit tests