some tests and other minor adjustments