Issues #374 and #373 completed. Tests were fixed.