Fixed Hybrid\Chart\Fluent test case, and small refactor.

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