simplifying the test utils and improving the callbac-y-ness