Add more tests & fixtures