add test and remove activesupport methods