framework tests + build re-structure