Made save test better