Fix broken tests as a result of #112 merge