redid tests and loops