#16 Fixed test