Wfk2 600

Add in missing functional tests.