WIP: Make tests pass