New 404 handling; TestController added