FIxed unit tests