[WFK-600] - Update to include the functional tests that okiss fixed.
Merge pull request #11 from joshuawilson/WFK2-600

[WFK-600] - Update to include the functional tests that okiss fixed.