Updated tests & made psr-2 compliant