An attempt to resolve copy-paste Trevis issues in Infrastructure
An attempt to resolve Trevis issues in ViewModelTests
Small refactoring