added fixtures and some tests