fixes for spec tests