Fixing various problems with my test layout; apparently I don't know how to use assertions.