More Tests for Erwin-Jarvis
Added the final tests for Erwin Jarvis (I hope\!).  Formatting the comments are little nicer