Added some code and removed a test.