Reorganizing to improve tests
Automatically iterate over tests