more unit tests; use mockito; work better with unnormalized paths