fixed unit tests and UI to work with new model