restructure tests table and form