Add unit tests (something is not working)