Added tests for non-custom id