Fixed tests for moving code up/down