add pass4 stuff from eos and renamed test dir