Fixed Test suite bugs, and Doc Based model bugs