Cleanup; add tests
push script