Revert "Fixed up failing tests problem"

This reverts commit 0ad22b62769f4983569e79713852de8f66f75551.
Second attempt, a different way