Forward tests refactored