#223 Test broke sometimes (depending on order of execution)