Fixed failing unit tests
Merged master into solutions