Cleaned up test directories
Added more type constraint forms