refactor-polish existing tests