First pass at some nicely broken tests in both unit and integration form