Added Fixtures and Fixed Tests