Adding test for related classes