Fix tests, remove packages