added some quick tests.  added self tracking