test fixes.. finally