Tests made self-contained