rgs1 Cleanup tests to use unittest framework