Another try at getting tests to pass.