Fix a bunch of tests

@zenachaturvedi @osheroff 

--end would print one last one > end_time before stopping.