Update image name to use file in env dir if exists
Fix tests and consolidate test targets in makefile

Tests now run on the test container only.
now just: make test

Think this may be the expectation and is simpler.