Update spec tests and rearrange tests.