Add some pending tests to implement
Remove ID requirement