rm calendar results, update tests and views