Fixing 2 more junit tests