Improved test structure
Migrated to junit 4
Added test for trim
Removed TODO test