#519 Fix Fix some specs