Clean up

finish testing around