Remove trait and fix tests
Remove trait test