Cleanup; add tests