Test passes
More API wrapping