clean up the unit tests for constraints
API change and clarification in ResourceMapping. Start testing CSingleResourceCapacity.