Adding tests in default module
Many corrections