Fixes to pass course tests