Better mechanism to add TestCases and added comments.