Fixed test crashing due to bad interface design