Add exports, and cleanup
Improve testing