Got many tests working, fixed bug in time comparison
Update tests