Fix tests for activate-corresponding-ruby
Implement suggestions to cleanup