Some test updates I had lying around