Fixing the WA/dev -> sql/dev-slorg merge and adding missing files.
moving a file to the correct directory.  Fixing some tests.