Improved local testing
merge master