refactor and enhance dev tests