All specs passing now