Issue #133 - Adding some tests to the default controller