GCP-7579 Externalize hard-coded values into properties file + some JUnit code review/cleanup