clearer definition of test_lib
Replacing some of the Slots by Instances