Update to PSR-2, new test function and more