Merge "Adding/modifying tests for new 2.3 API"