better test, improve class graph