[Framework tests] light refactoring / cleanup.

I'm going to attach the CLA