Test classes reorganization
Calculated values binding test added