Reverted some of the previous changes due to errors. Updated some of the tests...
Reverted some of the previous changes due to errors. Updated some of the tests so that CPU versions can pass as well. Signed-off-by: Jan André Reuter <jan.andre.reuter@hotmail.de>