Removed Calendar Class from test, added to Month