Better fixtures and a few more tests