Changes in test system
Speed up noCL version