Added things for the second test. Running into memory leaks. Need to fix.