Fix issue with parsing environment variables pairs that contain only keys; update tests to handle this case