Revert "Getting tests running"

This reverts commit 12a5e49129f8fa27cf319f0dbfc00caeadc12840.