Fixed test and implementation
2 files changed