refactors for latest testlab version