Add unit test and update schema for #17