Add new function
Expose function
Removed old tests