Integrated changes to testing.
Added a build.