Added current date param to calculator constructor, fixed/added calc tests
Added current date param to calculator constructor, fixed/added calc tests