Fixed some extra unit-tests