Added saving and loading for Tests, needs rewriting