Another attempt at getting tests to pass.