cleanup, initial tests