Remove redundant inheritance from Invalidating and repackage test files