refactor: modules
option tests (#808)
#809
+1,735
−620
Merged