(WIP) Added spec tests for new default options