New testmodules added. Restructured Testing.