Get fixtures working on 15.* branch

[flarnie]

There are multiple errors thrown when trying to build the fixtures on the 15-stable and 15.6-dev branches. I need the fixtures working in order to do some manual testing of add-on fixes.