+1 for splitting into 2 tests :D