Changed the test to loop and be more comprehensive, added fixture data