fixed test names, and split up combined tests