partial rivets test implementation
passing rivet test
Merge branch 'rivetsTest' into config