cleanup, started fixing tests