copy over tests
fix tests that were failing