cleared out unused stuff
converted test suite