Work on some tests (still not passing)