Add tests for some tasks
PSR fixes