Fix tests, add pak test