Prepare for tests
PSR fixes