Changes done for test cases and best practices