Don't allow unexpected elements in array and sample tests update