Updated unit tests again