added a loooooooooooooooooooooooooot of test cases
removed unused remarks