Added tests
Main correction