more testing

cleanup too