Moved some tests after meeting with John
Fixing up Categorical as I try and figure out why I debug my first test