Rename tests
Allow constructor to be called without options