Sync'ed tests with the ones from Java

Change-Id: Idf35ef58e556359c252df7a72ba89b8b6328513a