#1 fixed - Added proper test suite