updating code to match psr's
removed the test now-irrelevant test