Internal refactoring. Minors tweaks. Use SenTest for iOS6.1 compat