tests updated to reflect nested classes support