converted data structure to method calls
formatting
Changed syntax so that tests occur on a yielded object instead of a returned one