Fix tests, add package info