Minor tweaks to make testing easier
More tests