Updated test for the two main cases