Fix broken tests

2014