Edits: adding comments on test code relocation