Bug fixes and converted test files to unix file endings.