Bam/clean up tests