fix Test + Form types