various test fixes
various fixes for tests