Added missing file
Fixed up test suite and lint errors