Fix tests and lints