Heri & Sophie | 3212 & 3214 | Addding more tests and fix one bug found during showcase