Added some additional checks and tests.