Merge "Fix for not running tests"