This uncomments the setup test (i'm not sure why it was commented out - it passes fine)
It adds better mocking for some data.
Finally whilst most methods mocked JHtml::calendar the last two didn't leading to un-needed dependencies. This fixes the last two tests to act in a similar way to the previous tests - where the successful test is defined as JHtml::calendar being called once with the expected parameters.
thanks