added workitem and fixed integration tests