Add status and status tests