Refactored test specs