Update querys/generated methods for Delete, add tests for count, delete
Modified count for Where statements