Extended unit tests to cover empty values