Fixed indentation, test directories and some other small stuff