misc stuff; new tests;