Commented out things that don't link up in the Junit Model tests