Add tests with null values to cover first design flaw