Improved CPU test to consider the GPU aswell