Added test cases for retrieval