Updated unit tests to pass