test added + clean up