Fixed timing a bit
Added better testing methods.