Fixes for changed function returns and unit test for deletion of old drawing code.