Fix all tests
Merge home branch