Adding some more tests. Making id behave properly. Fixes #1.