Added exists check, test failing currently