Add missing copyright
Add persistence test
Add some javadoc