WIP: Make tests work