The ABS controller partially fixed the problem. When installing it, the Brake and ABS lights went out as expected but after 2 minutes they came on after every engine start. The tester came up with a fault saying "the vin number doesn't match and needs to be entered". My mechanic doesn't have that equipment but is checking around.