Fixed issues with tests for week 4
Added baselined week 6 code