add SRM 616 and adjust some test classes