Added missing raw methods and tests