- Disable class level keywords from method parameters list - Reorganize completion tests to separate methods