Cheeses some tests pre-refactor