Dev

Added more test cases