Merge "Increase test coverage for DEB env"