Move additional tests