Test Fixes - Run ant format-source