** Unit-test update **

-> Fixed a failure on test for #405 due to the code changes