Fixed implementation test