Splits moveItem() tests for better readability and minor code improvements