Add more edge cases specs as disabled on Configuration