#: Tests fixes