sixth Commit: Improve test form