Started working on semi-rewriting systemTest.c

Still working, just a quick sync