additional tests and subsequent bug fixes