Some tweaks for better acceleration debugging and updating test 2