Further test clean-up, adds test for empty list