Some asthetic changes and fixed phpunit test;