moved is*() to compare*()
updated ModelTest to reflect Model changes