Fixing tests and model

Signed-off-by: Pieter-Jan Van de Perre <pieter-jan.vandeperre@student.kdg.be>