tests, cleanup, dev