merge with fix-tests