Cdrom test updates and bugfix