Better Request class + PHPUnit
Fix to use single instance rather than constructor