Fix Core unit tests [#1666]
Fix Core unit tests [#1666]

mbuttu/butter,robinparadise/videoquizmaker,mbuttu/butter,BBGInnovate/butter,BBGInnovate/butter,mozilla/butter,robinparadise/videoquizmaker,mbuttu/butter,mozilla/butter