Fix lion init. Add some another tests for it.