[#26] Relations added and improved fixtures