Fixed the graphics tests to be inline with some of the minor changes caused by implementing R# changes

Signed-off-by: Martin Evans <martindevans@gmail.com>