Added extra tests for User Day spec and small tidying up to update to newer Ruby syntax