first part of test fixes