Workpackage fixes and Unittests