Updated JGraphXAdapter with more tests

Intermediate merge so other group can profit from previous fixes