Added spec for Issues #23 and #25