Align with sub-modules
Add integration test about the class observed in relation tuples.