Updated validation + tests to cover one an overlooked case.