Edit "broken" files to match "fixed" files using VIM. Time yourself on real editing/refactoring tasks to improve your VIM skills.