Fix Indentation, Add new test cases