Convert more tests to behave.