Add specs and cleanup.