Work package #patch - incomplete tests
Clening up