Comment this out for now
Rearrange to put the tests together