Finish status styling
Fix failing test