Fix issue with getSettings() in BaseTest
Fix issue preventing ThrottleTest working correctly

Conflicts:
	test/test/api/BaseTest.java