fix package naming, missing @Test and broken tests