fixing #1868 Misc accumulated fixes

Added fixes to their new file locations and added a small fix for a failing test

Finish gh-1868
Make a ticket for this and a link to remote this condition.