removed unneeded classes and began with code cleanup
now test is again working with removed classes