Many updates for testing, mdae function for collecting summary