API Changes and Fixes
Added testing file