Fix remaining tests, REST and GUI client classes