Fixed some issues with Tests with new db change i made recently