Fix some bugs - now it works for all fast/medium tests not involving e-lens (as expected)
Fix some bugs - now it works for all fast/medium tests not involving e-lens (as expected)

SixTrack/SixTrack,SixTrack/SixTrack,SixTrack/SixTrack,SixTrack/SixTrack,SixTrack/SixTrack,SixTrack/SixTrack