Rearranging tests, sequence diagrams