JM - Fixed some tests