Merge pull request #395 from cpirich/master

lint fixes
lint fix
Merge pull request #396 from code-dot-org/levelTests

lint fix