Added trim and trimF tests and a fix for those two