new-features: Refactor tests