test cleanup, capture constructor fix