Fix tests, sort of
Merge first round of test fixes
Get resources on package form working