Adding more tests, to prevent NPE
Added logging statement to TestCaseContainer