Simplify router.ServeFiles a bit
Add NotFound test