diff --git a/test/functional/v1/deal.test.ts b/test/functional/v1/deal.test.ts
deleted file mode 100644
index fe596b98..00000000
--- a/test/functional/v1/deal.test.ts
+++ /dev/null
@@ -1,179 +0,0 @@
-import {
-	Configuration,
-	DealsApi,
-	OAuth2Configuration,
-	GetAddedDealResponse, GetDealResponse, GetDealsResponse, UpdateDealRequest,
-} from '../../../dist/versions/v1';
-import { oauth2Config } from '../constants';
-import { ApiMock } from '../stubs';
-
-describe('v1/deals', () => {
-	let oauthClient: OAuth2Configuration;
-	let dealsApi: DealsApi;
-	let mock : ApiMock;
-
-	beforeAll(async () => {
-		mock = new ApiMock({
-			basePath: '/v1/deals',
-			host: 'http://localhost/api',
-		});
-		mock.cleanAll();
-	});
-
-	afterAll(async () => {
-		mock.restore();
-	});
-
-	beforeEach(async () => {
-		mock.cleanAll();
-
-		oauthClient = new OAuth2Configuration(oauth2Config);
-
-		oauthClient.updateToken({
-			refresh_token: 'freshAccessToken',
-			expires_in: 100,
-			token_type: 'bearer',
-			scope: 'deals:full,users:full,1337',
-			api_domain: 'http://localhost',
-			access_token: 'freshAccessToken',
-		});
-
-		const apiConfig = new Configuration({
-			accessToken: oauthClient.getAccessToken,
-			basePath: oauthClient.basePath,
-		});
-		dealsApi = new DealsApi(apiConfig);
-	});
-
-	test('should get deals', async () => {
-		const response: GetDealsResponse = {
-			success: true,
-			data: [
-				{
-					id: 1,
-					title: 'Deal 1',
-					value: 1000,
-				},
-			],
-		};
-
-		mock.get({
-			url: '',
-			response,
-			status: 200,
-		});
-
-		const deals = await dealsApi.getDeals();
-
-		expect(deals).toEqual(response);
-	});
-
-	test('should create a deal', async () => {
-		const response: GetAddedDealResponse = {
-			success: true,
-			data: {
-				id: 2,
-				title: 'New Deal',
-				value: 2000,
-			},
-		};
-
-		mock.post({
-			url: '',
-			response,
-			status: 201,
-		});
-
-		const apiConfig = new Configuration({
-			accessToken: oauthClient.getAccessToken,
-			basePath: oauthClient.basePath,
-		});
-		const dealsApi = new DealsApi(apiConfig);
-
-		const createdDeal = await dealsApi.addDeal({
-			AddDealRequest: {
-				title: 'New Deal',
-				value: '2000',
-			},
-		});
-
-		expect(createdDeal).toEqual(response);
-	});
-
-	test('should get a deal by id', async () => {
-		const response: GetDealResponse = {
-			success: true,
-			data: {
-				id: 2,
-				title: 'New Deal',
-				value: 2000,
-			},
-		};
-
-		mock.get({
-			url: '/2',
-			response,
-			status: 200,
-		});
-
-		const apiConfig = new Configuration({
-			accessToken: oauthClient.getAccessToken,
-			basePath: oauthClient.basePath,
-		});
-		const dealsApi = new DealsApi(apiConfig);
-
-		const deal = await dealsApi.getDeal({
-			id: 2,
-		});
-
-		expect(deal).toEqual(response);
-	});
-
-	test('should update a deal', async () => {
-		const response: GetDealResponse = {
-			success: true,
-			data: {
-				id: 2,
-				title: 'Updated Deal',
-				value: 3000,
-			},
-		};
-		const payload : UpdateDealRequest = {
-			title: 'Updated Deal',
-			value: '3000',
-		};
-
-		mock.put({
-			url: '/2',
-			response,
-			status: 200,
-		});
-
-		const apiConfig = new Configuration({
-			accessToken: oauthClient.getAccessToken,
-			basePath: oauthClient.basePath,
-		});
-		const dealsApi = new DealsApi(apiConfig);
-
-		const updatedDeal = await dealsApi.updateDeal({
-			id: 2,
-			UpdateDealRequest: payload,
-		});
-
-		expect(updatedDeal).toEqual(response);
-	});
-
-	test('should delete a deal', async () => {
-		const response = { success: true };
-
-		mock.delete({
-			url: '/2',
-			response,
-			status: 200,
-		});
-
-		const deleteResponse = await dealsApi.deleteDeal({ id: 2 });
-
-		expect(deleteResponse).toEqual(response);
-	});
-});
\ No newline at end of file
diff --git a/test/functional/v1/activities.test.ts b/test/functional/v2/activities.test.ts
similarity index 86%
rename from test/functional/v1/activities.test.ts
rename to test/functional/v2/activities.test.ts
index aaedb8b3..0e42950b 100644
--- a/test/functional/v1/activities.test.ts
+++ b/test/functional/v2/activities.test.ts
@@ -1,15 +1,15 @@
 import {
 	Configuration,
 	ActivitiesApi,
-	GetActivityResponse,
+	UpsertActivityResponse,
 	GetActivitiesResponse,
-	UpdateActivityRequest,
+	AddActivityRequest,
 	OAuth2Configuration,
-} from '../../../dist/versions/v1';
+} from '../../../dist/versions/v2';
 import { DeepPartial, oauth2Config } from '../constants';
 import { ApiMock } from '../stubs';
 
-describe('v1/activities', () => {
+describe('v2/activities', () => {
 	let oauthClient: OAuth2Configuration;
 	let activitiesApi: ActivitiesApi;
 
@@ -17,7 +17,7 @@ describe('v1/activities', () => {
 
 	beforeAll(async () => {
 		mock = new ApiMock({
-			basePath: '/v1/activities',
+			basePath: '/v2/activities',
 			host: 'http://localhost/api',
 		});
 	});
@@ -74,7 +74,7 @@ describe('v1/activities', () => {
 	});
 
 	test('should create an activity', async () => {
-		const response: DeepPartial<GetActivityResponse> = {
+		const response: DeepPartial<UpsertActivityResponse> = {
 			success: true,
 			data: {
 				id: 2,
@@ -100,7 +100,7 @@ describe('v1/activities', () => {
 	});
 
 	test('should get an activity by id', async () => {
-		const response: DeepPartial<GetActivityResponse> = {
+		const response: DeepPartial<UpsertActivityResponse> = {
 			success: true,
 			data: {
 				id: 2,
@@ -122,18 +122,18 @@ describe('v1/activities', () => {
 	});
 
 	test('should update an activity', async () => {
-		const response: DeepPartial<GetActivityResponse> = {
+		const response: DeepPartial<UpsertActivityResponse> = {
 			success: true,
 			data: {
 				id: 2,
 				note: 'Updated Activity',
 			},
 		};
-		const payload: UpdateActivityRequest = {
+		const payload: AddActivityRequest = {
 			note: 'Updated Activity',
 		};
 
-		mock.put({
+		mock.patch({
 			url: '/2',
 			response,
 			status: 200,
@@ -141,7 +141,7 @@ describe('v1/activities', () => {
 
 		const updatedActivity = await activitiesApi.updateActivity({
 			id: 2,
-			UpdateActivityRequest: payload,
+			AddActivityRequest: payload,
 		});
 
 		expect(updatedActivity).toEqual(response);
@@ -160,4 +160,4 @@ describe('v1/activities', () => {
 
 		expect(deleteResponse).toEqual(response);
 	});
-});
\ No newline at end of file
+});