Heri & Sophie | #3212 & #3214 | Updating tests & adding more exception