handle 404 status code
Cleanup tests
Merge PR #2