Added tests with saved form