changed capacity factor to energy definition. added tests.