Added new forms test structure