Adds additional spec tests