Separation of FVT (model) and unit tests. This removes the problematic model dependency from the project.