fix package names. rename some tests classes