Fix Android tests
Make Android test load files with diagnostics
Do not cast arguments of binary operation to expected type for byte and short
Rename parameter