Split out tests into own file. Update timing