Some unit testing
Cleanup
Merged
Test Fixes, Conversion Removal