couple more fixes for unit tests.
couple more fixes for unit tests.

dashkb/metabase,dashkb/metabase,dashkb/metabase,blueoceanideas/metabase,dashkb/metabase,dashkb/metabase,blueoceanideas/metabase,blueoceanideas/metabase,blueoceanideas/metabase,blueoceanideas/metabase