mark - test fixes