adding default settings, multiple diff types and more tests