Updated unit tests for new Unit