Fix unit tests and 404 page not found error