Add more status tests