Added tests for generated types