Added more Unit Test Helpers
Added more Unit Tests and TODOs
Modified trim RegEx and Added Multi-Type Checking