updated testing
cleanup