Fixed tests, added history

BUGGED GENERALS!