@thyms fixing tests.