Revamping test system so it works again.