newsubject tests and fixes
refactored rating plans structure