Make tests pass again

Also add some new properties and remove older deprecated properties and models