Futurize!
Fix some online unit tests