Re-organize tests. Again.