Removing old unused classes - adding @group test annotations