Add more tests

Also snuck in timing code