clean up env variables; add unit test for glusterfs