Improve statamode tests