fixed code to ensure all tests pass. Beginning work on complete turn workflow tests
Merge remote-tracking branch 'origin/master'