Attempt to fix package errors. Also add test file.