enh: refactored tests