Got all tests working