some minor cleanups; enabled some tests