Re-added my changes

I readded my changes to testsuite code file and header file because they
got burned in an old commit. Once again, may or may not compile.