Issue 118 - Fixed test