Make tests pass. Including encore exercises.