Multiple update to Hybrid\Chart\* unit test

Signed-off-by: crynobone <crynobone@gmail.com>