All specs now pass