Added adjustable noise, test scripts