Removed mistaken piece of code, this is responsibility of findById()
Refactor and added some tests