Add out of framework tests build
Code refactoring