Updating S3 model and adding a couple more unit tests.