Retrieve tests improved, bitches!