Updated unit tests for #59