raise the SkipTest exception, fixes #364
code cleanup (move imports and SkipTest exceptions to top)
Merge remote-tracking branch 'upstream'