refactor tests suite