Fixes, now specs pass 100%.
Moved package test out of conf.
Fixed install/upgrade specs.