Changed tests to kill Pashs workaround