Testing

Some minor changes to help with testing.