[WIP COMMIT] Make tests compile