Cleaned up tests further, in anticipation of merges with other branches