BS-8841, add integration tests and updated properties files