revamps tests, still not working as exit kills PHPUnit
modularizes __invoke
does more de-dupe
removes test
makes file cleaner