Reduce failures in unit tests

Correct some failing unit tests so that they reflect expected behavior.