Updated component tests.
Fixed coding style.
Fixed plural(ism).