refactor for 'test' env initialization
typo fixes