Finished ComponentMapping and tests