changed expected exception to ConflictException
test changed for new exception
test renamed a little
Merge pull request #69 from davidmoebius/remove_NotFoundException

Remove not found exception