Extend with more tests for the current state