Updated unit tests (finally!).