pushing some test fixes