Fixed additional package installs and committed test code to avoid future cut & paste errors.