Remove unneeded cd
Update tests