Merged TCK contributions from Hackergarten.
Removed testng refs.