Testing
Rename trim_right => trimRight
Fix bugs found in testing