cleanup, added test