cleaning up some APIs
Refactored Tests