Move some methods around to have them together by call order logic. Also update current test methods with composer based .env reader.
