Added more tests/checks.