added iOS6 tests
refactor