using phpunit 4, more cleanup