Fix failing test
Add charge model
working import charge table