clean up and flesh out test a bit more