adjusted last non-core classes and tests to follow the psr1 and psr2 php coding standard.