Fix tests to work on cedar-14 by default