Extract definition
Added missing test modules