Minor improvements and removes workaround for phpunit 3.4