fixing tests and making tests psr-0 ready