Update 1.9.2014 1022

Changed format of test display for bottom_type_effects.
There was an error introduced within the code of wave_queue.cc when merging, rectified and verified correctness with regression tests.