Fixed: Tests
Fixed: Fields and Functions I forgot to cleanup while refactoring
Fixed: Chargeable default value