Adding proper test cases