Compile Test, Upgrade Code To Pass Critic