Clean up tests a little and then start work on the relationships