Remove excess code, minor clean up of some tests