I think it works, but tests are all hosed