minor fixes and remove stale tests