Cleaned this up (removed all non ARC code) and ported to XCTest structure
Remove non-ARC code