Fix WHEREFORE test
Add test names to failing WHEREFORE tests