test fixes, other fixens