Extract create_cleanup_sr

According to review comments
Added comments to test cases

As requested per the review