Some lint fixes and correct tests that are timing out now