Rearrange tests to better match core implementation