improved coverage; fixed broken specs