WIP: tests are passing again