added new singleton to use preprocessor callbacks
added parent constructor
commented out unneeded stuff
removed unneeded classes and began with code cleanup
now test is again working with removed classes