Some fixes. Some working test cases