Fixed bootstrap in tests
Fixed PSR stuff