some test fixes
fixed some more bugs