#653 - updated capacity representation
#653 - updated tests
#653 - add down-regulation tests
minor cleanup