Improve Basic and Capture move unit test