last cleanup & tests