Fixed tests configuration and tests themselves.