Final fixes to get burritile building.
WIP almost got tests compiling.