fixing #1868 Misc accumulated fixes

Added fixes to their new file locations and added a small fix for a failing test

Finish gh-1868
And move the tests to the right place at the same time.