Added testing structure pluss some testsclasses