More refactoring. Replaced all ObservableCollection instances with Lists to resolve unit test issues. More unit tests.