merging in test changes

Cleaned up tests