Promote develop

Clean up some build details, add tests.