Feat (math model/tests): Updated math model and tests to match use format 1b07a9d nickfraser commited on Jun 28