Updated messaging and test cases.
Updated test cases and env.