Revert "fixed tests"

This reverts commit c8c80e5b103e9ce9fe810b546c971a69fce8e0c7.
Revert "Fixing indent"

This reverts commit b6bebfff8c2e74475d96aaf9515c41ac1bd35000.
Merge origin/indigo-devel into indigo-devel