lint/test fixes