Fix tests and proability model usage