Latest fixes for testing