cleanup, fixing some tests