bugFix => update unit tests