Added handling of attendance.
Fixed broken unit test.