Added some prepared classes to continue development as soon as possible.
fixed some test issues...