Moved settings for DB out of db file so it and store procs can be committed. Updates. Added Test