refactor tests and fixed drl