Adding/fixing specs to get coverage back to 100%.