Get tests to work again
Resolve conflicts