Updated Testing Scripts