Removed FlatSpec and ShouldMatcher because these wont support testng.

SK
Merge remote-tracking branch 'origin/master'