Added some content to the lib classes and testmains