Updated a few unit tests for robustness.