Expand tests and remove --mirror