mark - test fixes; all tests working