Parse skips since JUnit now allows them. Also add and update tests.

Fix some tabs
Merge remote-tracking branch 'origin/master'