restructured tests, added view disciplinary