JM - Added new tests