New test, small tweaks.