Almost have all tests working