Fix failing tests for indexing int, short and byte