Merge pull request #338 from Muscraft/make-tests-use-line-numbers

Merge pull request #338 from Muscraft/make-tests-use-line-numbers #375