Added ARM support. Minor refactoring of tests