More intelligent RPM tests.

I broke them down to more parts
Removal of shell.run spamming