Fix shift/unshift unit tests