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