wip
checkpoint: builds and pulls in test package
clean up around generalizing test packages
Removed a todo statement because it works
adding names and test packages where applicable; wip