exo2 cosmetics
cleanup
adding new version of test
fixing test3