making script changes. updating tests.