More attempts at getting tests to run.