Bit more validation and associated tests.