Beginning to clean up and update Makefile for tests.

Needed to remove a (potentially) conflicting 'google'
package for Debian systems. This is problematic.