Updated mock object to usage of supertype Map instead of HashMap