More work on basic buildout.
Fixed test running.
Fixed test running. Merged.