Simplify unit tests, finish section 5.3