More helpful test examples and testing along with some API improvements