Improved test cases to be able to save