 
 class PostgresStORMTests: XCTestCase {
 
-	#if os(Linux)
-	var connect = PostgresConnect(
-		host: ProcessInfo.processInfo.environment["HOST"]!,
-		username: ProcessInfo.processInfo.environment["USER"]!,
-		password: ProcessInfo.processInfo.environment["PASS"]!,
-		database: ProcessInfo.processInfo.environment["DB"]!,
-		port: Int(ProcessInfo.processInfo.environment["PORT"]!)!
-	)
-	#else
-	var connect = PostgresConnect(
-		host: "localhost",
-		username: "perfect",
-		password: "perfect",
-		database: "perfect_testing",
-		port: 32768
-	)
-	#endif
-
-
 	override func setUp() {
 		super.setUp()
+		#if os(Linux)
+
+			PostgresConnector.host		= ProcessInfo.processInfo.environment["HOST"]!
+			PostgresConnector.username	= ProcessInfo.processInfo.environment["USER"]!
+			PostgresConnector.password	= ProcessInfo.processInfo.environment["PASS"]!
+			PostgresConnector.database	= ProcessInfo.processInfo.environment["DB"]!
+			PostgresConnector.port		= Int(ProcessInfo.processInfo.environment["PORT"]!)!
+
+		#else
+			PostgresConnector.host		= "localhost"
+			PostgresConnector.username	= "perfect"
+			PostgresConnector.password	= "perfect"
+			PostgresConnector.database	= "perfect_testing"
+			PostgresConnector.port		= 5432
+		#endif
+		let obj = User()
+		try? obj.setup()
 	}
 
 	/* =============================================================================================
 	Save - New
 	============================================================================================= */
 	func testSaveNew() {
-		print("postgresql://\(connect.credentials.username):\(connect.credentials.password)@\(connect.credentials.host):\(connect.credentials.port)/\(connect.database)")
 
 		let obj = User()
 		obj.firstname = "X"

		obj.id = 1111111
		do {
			try obj.get()
			XCTFail("Should have failed (record not found)")
		} catch {
			if case .noRecordFound = obj.error {
				XCTFail("Fall through... Should have failed (record not found): \(obj.error.string())")
			}
			print("^ Ignore this error, that is expected and should show 'ERROR:  not found'")
			// test passes - should have a failure!
		}
	}


	============================================================================================= */
	func testCheckDeleteSQL() {
		let obj = User()
		XCTAssert(obj.deleteSQL("test", idName: "testid") == "DELETE FROM test WHERE \"testid\" = $1", "DeleteSQL statement is not correct")

	}

