Added and updated tests for new Not Found Page functionality