updated source to psr-4, optimized tests