Fixing compnent constants and tests