New test, fixed other test.