Remove unused code
Add POST test case
Fix find query