slight Change to build system
Added structures to simplify creation of test plans