Also removed the tests related to disabled functionality, so that the
complete build can be run if people so desire.