Moved functional tests to pabst
Merge pull request #202 from shermdog/unit-tests

Master merge + Moved functional tests to pabst
Merge pull request #203 from Juniper/unit-tests

Moved functional tests to pabst
Merge remote-tracking branch 'upstream/master'
unit tests added for changes made under  #197