calendar controller tests and modification to test.py
merge conflict resolved