Update tests and fix psr-2 problems