Minor code change
Add set test/impl