All tests are running again. There's still some issues to work out though. See #17