Fixed tests and new test form