Refact of Unloading and fix for members of class

This will make the test for unloading correct :-)