improving unit tests + more of them
EMUT (even more unit tests)