Adding more tests & fixtures