Missed some test changes (already found a bug using unit testing…)