More Joint tests

fixed some criteria bugs