Test fix.
Removed meaningless test.
Removed unused class.
NPE fix.
Removed unused method.
Proper conditional.
Test fix.
Minor. Formatting.
Merge branch 'master' of git@github.com:p6spy/p6spy.git