Class restructuring and update of test build options.