extra tests and some minor fixes for recent changes