fixed typos in test
fix alignment of tests
fix expected order of statements in extractSimpleBlock
replace extracted expression