added some tests, new scheme, and codox