Refactored test signals