Added tests and persistent data