Added errors (w/ tests)