More succinct relationship assertions
More resilient `make testwatch`
Fix failing specs (Bad developer!  Run tests!)