Add additional unit tests and merge webkit/master.