Removed trim and fixed test