added a few assertions
code cleanup
include the implementation file of wave propagation in the cxx test scons call