Fixed test. Added new code