Updated test scripts. Still working on it