Fixed up tests and lint error