Minor edits
More tests