Bug fixes and test files.