Added tests
Changed indentations