Updated unit tests so that they pass