Update tests
Rewrite old tests and add timings tests