Some of the tests were failing because they didn't expect the controlbox to be returned from localStorage. It's too long ago that I've looked at this branch for me to say whether this is a legitimate bug or not. Will have to investigate further.