refactor tests and fixed drl
refactor tests and fixed drl