Testing

Improvements and fixes