Generalized #include; bugfixed testProcedures