Adding evaluation to when atoms
Updating tests