GCP-5524 Added jUnit test; enhancements