setup tests env
reorganize
typo