GCP-5604 (Fixes bugs on JUnit, and functions)