Updated unit tests so that all pass