Incorporate suggestion into CompilerServiceTest