Fixed tests
Fixed rendering saved data form