Fixing Test008... not much in this commit