Make test flow clearer and more stylish