Refs #6315. Handling W matrix the right way in test.
Refs #6315. Fix to make unit tests happy.