Clean new tests architecture