Added test and additional persistence model classes