Merging test classes into shared source (CR Feedback)