All test passing and integrated into the main spec