Make where optional

Also use the where builder in get/update/delete methods
Updated tests