Add two tests and rearrange