Fixed Redex style, Add tests