add powermock, bump up test coverage a bit more
Merge remote-tracking branch 'origin/master'