Updated DB core now passing query string builder unit tests