Made library more ios-y and made sure tests still ran.