Fix regression main and service tests to work. #116