add more status tests and TODOs