converted to modern objective-c syntax
fixed broken test