Proofread tests and code, edited indentation