Add test version of saver