Update mock names, and start to include test files.