Added custom 404 & 500 and updated tests for it