Tests and tweaks.