Fixed tests for spark lines
Fixed lots of elint warnings