[core] Fix master tests
Merge remote-tracking branch 'remotes/origin/hue-testing-abe' into hue-testing-abe