Merge test

merge test after editing a class