added fixtures and tests