Moved old test, fixes
Fixed some of the charge logic
Updated interface test to use fixtures
Forogt to add fixtures
Fixed fixutres
a test