Refactor every() and some()
Fix failing tests