Tests for Default controller; some small changes