Updating unit tests, finish PSR2 compliance