Updated unit tests for latest improvements.