- refactor tests