Added ResourceNotFoundException and fixed unit tests.