fixing drop keywords, adding test cases