move expected files into environment
tweaks