WIP FIX: Get tests passing