Correct some bad indentations & factorise unit tests
Remove useless uploads