moved rate increments in the group scope
more tests for splitting
one more test for group split
working on duration expire time
merge Dan's work
fixed tests
added +duration and *monthly for expiration time