Restore package path
Add test for account, embedded resources