~ minor fixes
~ added / fixed some tests