made appropriate changes to callisto and its test