Corrected some tests.
Getting timing to work better compiled too