Add tests and remove wasSaved