Smsbillable changes to models and new tests