component renamed and more test coverage