Reconcile a merge + stash pop
Use Test::Most and stop counting tests

Conflicts:
	t/Complex.t