Updated unit tests so they still work.