all old tests are passing now