Refactor testing, remove grabber method from assert