Add some tests
Change id