Added null handling + grouping test to install-check