Clean up and include changes discussed in #16
Update tests to include one for working defs

Account for changes made during the implementation of #16
Update to 0.2.0 due to breaking changes.