Tests now pass (albeit truncated)